More invalid source fixes

https://bugzilla.gnome.org/show_bug.cgi?id=711732

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index c40d8f6338a742406b6a97378e34ff61685ba748..c683cc2ba2abd95efee3db863c2cd487c2115ec2 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1355,7 +1355,9 @@ const AppIcon = new Lang.Class({
             this._removeMenuTimeout();
             this._menuTimeoutId = Mainloop.timeout_add(MENU_POPUP_TIMEOUT,
                 Lang.bind(this, function() {
+                    this._menuTimeoutId = 0;
                     this.popupMenu();
+                    return false;
                 }));
         } else if (button == 3) {
             this.popupMenu();

diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index d452f9cc7635ac88074cc4c99628d34b68a1eae9..57e7628d36c6e79d0e5e8689edd9f6fa8de21928 100644 (file)
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -434,6 +434,7 @@ const VPNRequestHandler = new Lang.Class({
     },
 
     _vpnChildFinished: function(pid, status, requestObj) {
+        this._childWatch = 0;
         if (this._newStylePlugin) {
             // For new style plugin, all work is done in the async reading functions
             // Just reap the process here

diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js
index c4565ecff949f96de3e968371e40568800aef6b8..b24791df8c401e980aab9d2fe71e0091324de112 100644 (file)
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -960,6 +960,8 @@ const ChatNotification = new Lang.Class({
     },
 
     appendTimestamp: function() {
+        this._timestampTimeoutId = 0;
+
         let lastMessageTime = this._history[0].time;
         let lastMessageDate = new Date(lastMessageTime * 1000);
 

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 11f619ae11772445594fef70f333a7f5a8ddc211..60ca3f7c0f03a08c9d452716c968399e844fcd00 100644 (file)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -415,6 +415,7 @@ const EndSessionDialog = new Lang.Class({
                 let dialogContent = DialogContent[this._type];
                 let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
                 this._confirm(button.signal);
+                this._timerId = 0;
 
                 return false;
             }));

diff --git a/js/ui/overview.js b/js/ui/overview.js
index fedfea0b96ac9f842c535e241af147a2fe9cfc6c..867f7ef92e6a981908dba40e35eca877f103ae5a 100644 (file)
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -363,11 +363,13 @@ const Overview = new Lang.Class({
             this._lastHoveredWindow = dragEvent.targetActor._delegate.metaWindow;
             this._windowSwitchTimeoutId = Mainloop.timeout_add(DND_WINDOW_SWITCH_TIMEOUT,
                                             Lang.bind(this, function() {
+                                                this._windowSwitchTimeoutId = 0;
                                                 this._needsFakePointerEvent = true;
                                                 Main.activateWindow(dragEvent.targetActor._delegate.metaWindow,
                                                                     this._windowSwitchTimestamp);
                                                 this.hide();
                                                 this._lastHoveredWindow = null;
+                                                return false;
                                             }));
         }
 

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index be1407d90860346d0f158242c498dc70cc772252..4f3958d5c3dc9da63778bbd6a9d551bc54a1caa2 100644 (file)
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1208,6 +1208,7 @@ const Workspace = new Lang.Class({
         }
 
         this._recalculateWindowPositions(WindowPositionFlags.ANIMATE);
+        this._repositionWindowsId = 0;
         return false;
     },